Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 30 Mar 2010 04:00:46 +0000 (04:00 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 30 Mar 2010 04:00:46 +0000 (04:00 +0000)

Trivial merge